From 2cd0526942eeb49c088438230d92b6c8c2542c5f Mon Sep 17 00:00:00 2001 From: "smh22@firebug.cl.cam.ac.uk" Date: Wed, 6 Jul 2005 16:50:57 +0000 Subject: [PATCH] Fix blkif 'grant-table-ification' Signed-off-by: Steven Hand --- linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c index 4aaef6b116..aaa976c557 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/interface.c @@ -219,9 +219,7 @@ void blkif_connect(blkif_be_connect_t *connect) op.ref = ref; op.dom = domid; - if(unlikely(HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1))) { - BUG(); - } + BUG_ON( HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref, &op, 1) ); handle = op.handle; @@ -232,10 +230,6 @@ void blkif_connect(blkif_be_connect_t *connect) return; } - phys_to_machine_mapping[__pa(VMALLOC_VMADDR(vma->addr)) >> - PAGE_SHIFT] = - FOREIGN_FRAME(shmem_frame); - blkif->shmem_ref = ref; blkif->shmem_handle = handle; blkif->shmem_vaddr = VMALLOC_VMADDR(vma->addr); -- 2.30.2